GtkWidget: Fix motion event consumption detection for touch-only gestures
authorCarlos Garnacho <carlosg@gnome.org>
Mon, 11 Jan 2016 19:06:14 +0000 (20:06 +0100)
committerCarlos Garnacho <carlosg@gnome.org>
Mon, 11 Jan 2016 19:16:06 +0000 (20:16 +0100)
If a GtkGestureSingle is set as touch-only, pointer events would be
discarded without giving an opportunity to the regular GtkGesture
handler to manage those.

Because the pointer events weren't actually managed by the gesture,
gtk_gesture_get_sequence_state() (rather unhelpfully here) will resort
to returning GTK_EVENT_SEQUENCE_NONE, which is in turn interpreted
by _gtk_widget_consumes_motion() as "may be handling the events for
this sequence", because gestures in this state presumably handle
the events, just that it's not "claimed" yet.

Instead, use gtk_gesture_handles_sequence(), which will perform the
expected check on the event sequence being managed, as we expect
here.

gtk/gtkwidget.c

index 80945246b07aef3af48dd25f5876bd09828d71bb..7ce8f839f27a1153cd3f4896c8138a83619f6423 100644 (file)
@@ -17593,8 +17593,7 @@ _gtk_widget_consumes_motion (GtkWidget        *widget,
       if ((!GTK_IS_GESTURE_SINGLE (data->controller) ||
            GTK_IS_GESTURE_DRAG (data->controller) ||
            GTK_IS_GESTURE_SWIPE (data->controller)) &&
-          gtk_gesture_get_sequence_state (GTK_GESTURE (data->controller),
-                                          sequence) != GTK_EVENT_SEQUENCE_DENIED)
+          gtk_gesture_handles_sequence (GTK_GESTURE (data->controller), sequence))
         return TRUE;
     }